#414 Better naming