simplified namespaces for readability

(also fixed framerate)