Rename to new naming convention, add memcached caching