Changed method names to match standards