Cleanup

Did some renaming