Changed some names of procedures