rename find_by_system to with_system