Improve internal naming