File input names are consistent now.

Closes #146