list/map: adders instead of setters
naming cleanup