Rename ManagerSettings -> EnvironmentSettings + cleanup