Namespace changes, int & float routes simplified