naming consistency

:trollface: 

/cc @cmeiklejohn