Name changes and data structure cleanup