add a fixme for later
rename maps variables