[#24] Renamed interface and implementation appropriately.