Rename findOneById to findById