#64 more cleanup and preventing duplicate names in front-end.