diff --git a/lib/xdg/migrate b/lib/xdg/migrate
index 9c1d53e..70d7fa9 100644
--- a/lib/xdg/migrate
+++ b/lib/xdg/migrate
@@ -3,13 +3,13 @@
 # https://specifications.freedesktop.org/basedir-spec/latest/
 
 xdgUpdateData() {
-	local -r programname=AtOM					\
-		my_data_home="${XDG_DATA_HOME:-$HOME/.local/share}"
+	local -r programname=AtOM
+	local -r my_data_home="${XDG_DATA_HOME:-$HOME/.local/share}/$programname"
 	local -r new_db_path="$my_data_home/atom.db"
 
 	[[ -d "$my_data_home" ]] || mkdir -p "$my_data_home"
 	mv "$1" "$new_db_path"
-	echo "$new_dp_path"
+	echo "$new_db_path"
 }
 
 xdgUpdateRuntime() {
@@ -20,12 +20,14 @@ xdgUpdateRuntime() {
 }
 
 xdgMigrate() {
-	local -r programname=AtOM					\
-		my_config_home="${XDG_CONFIG_HOME:-$HOME/.config}"	\
+	local -r programname=AtOM
+	local -r my_config_home="${XDG_CONFIG_HOME:-$HOME/.config}/$programname"
+	local new_database
 
 	cffile="$HOME/.atom/atom.cfg"
 	getConfig
-	database=$(xdgUpdateData "$database")
+	new_database=$(xdgUpdateData "$database")
+	database="$new_database"
 	tempdir=$(xdgUpdateRuntime)
 	cffile="$my_config_home/atom.cfg"
 	[[ -d "$my_config_home" ]] || mkdir -p "$my_config_home"