Cleaned up Location API and limited renaming to items