Renaming, general cleanup