Variable names cleanup