Switched up naming convention
Updated naming convention
Here we go.