Finished rename/refact on API namespace
Fixed spacing