Reverted namespace model