Fixed some names - references #59