fixed method names/params