Fix for possible name collisions, update readme