changed names and trying to import properly