Consistent file naming between dev/dist
include explicit context for clarity
Merge pull request #90 from adamlogic/simplify

Consistent file naming between dev/dist