spring-develop: renaming of methods

some methods and variables were renamed; also todo was added