Updated names & descriptions
Merge pull request #198 from iceglow/cleanup

Updated names & descriptions