Added more friendly names