Updated names

It should compile now.