A few renames and a fix