Namechange and added empty types