Merge "Handle template names that contains '-'"