removed references to dispy
renamed
renamed
correct modules