Improve egg naming convention