Edited namespace to all simple