Don't hardcode names in.
Merge pull request #679 from Enosphorous/master

Don't hardcode names in, use lang files!