type hint fix and namespace