fixed naming collsion issue. closes #21