Rename unncessarily public variables