Make base naming clear