Refactor code (correct errors of names)