added module name to Key references
fixed merge conflicts