Conform to API naming convention