working build with changed naming convention