refactor names of rest objcets and location