Closes #85 - Resolve minor rename issues

Pull request for #85