Fixed new naming for procedures

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>
Performance tuning

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>