Rename namespace, add logging