renaming methods, fixes #18 and #19