Changed method names and javadoc comments