Updated 'stubs' to used the proper names.