Continuing to update naming conventions and stuff