Changed naming a little bit for consistency