Get rid of Abstract prefix
Update generated stub code