consistency is king

cc @tmcinerney @danielbreves @Breezy077 

let's be consistent with our naming conventions