changed method names and added global namespaces