Dots, not underscores!

Addresses #689