- fixed references to proper namespaced ones.