cleaned up possible naming conflicts with other libraries