Updated SRG names to forge 871 compatability, fixed method names for
1.6.2 compat.