Method names and namespace name fixed.