Second part Namespace changes