Properly name methods
Fix wrong type terms.