Change link_callback variables to fit with variable naming convention