Cleanup: remove literal name strings, ...

Also fix a bug where I had an old name with "uses" instead of "age"