Fixed more naming conventions