fixed errors in naming and require