refact name variables