Edit some names

make it more meaningful