Updated names and removed old cache

Updated names and removed old cache