RFC: Resolve numerous naming conventions