fixed dict key names