Introduce naming convention in blueprints