#403 Better naming