Updated build.gradle to use appropriate names