Bug Fix - correct case fro templates and target files