use filename templates
use filename templates


Former-commit-id: f02984b93c3ce4bb885e2a63eb545c6f9287eeba [formerly 9e9a9b83082a94385c926675436ffdbd7c9704fe] [formerly 413920c08615a7631cae71f5137b6e08e71fbc28 [formerly 69b7ff13fb259949100710215a5661ef7edd921c]]
Former-commit-id: 28eee71a5c0d6e801a33b79575755e10cc760018 [formerly 7f87a879b10c9af9bcc482d1313cc59b14a48fc6]
Former-commit-id: 5014c50631922c280d12e13655ff54379447682d
jason-neal/eniric,jason-neal/eniric