Cleaning up naming of exercises