[#32] better names used