Rename/reorganize frame structures
Even more renaming