Fun refactoring for more consistent naming.
Prevent confusion like #21
Binaries.