Cleaned up the use of identifiers/paths/names. I'm in your yaks!

Remaining is to implement proper namespace lookup.

[#58959200]