REFACTORED: main namespace name to Api