More meaningful names

(really?)