better names [MJ-458]