Fixed deprecated placeholder keys.
Fixed broken tests caused by template rename.