Cleanup and rename of some things