[#36] Renamed function