Naming in Cleanup + fix in merge