More robust file naming strategy
Quote non-syntactic usages. Closes #136