Fix naming convention illogicalities