[BUGFIX] naming and namespace issues