Fixed naming inconsistencies
fixes #20
fixes #21