Doing a little renaming and cleaning up
clean up