Change template names to not have underscores pending a workaround