Changed for more friendly names