use consistent name scheme