updated some key names to make certain paths more clear