Renamed security, bucket prop, conf mapping