Automated Modjam Commit: 16:33:26.16
Small changes to naming structure.