refactoring of names - missed one some places. see #34