switch to namespaced keywords

was sort of doing it anyways, this seems cleaner.