Cleaned up new code to match project naming conventions

Auto tools were giving a lot of distracting warnings and my ocd took-over