Update naming a little