Fix wrong names and method