Changed some method names to correct names.