Changing configuration references to proper values