Minor renamings to make things a bit clearer