Naming consistency and javadoc @Return added