fixed names for proper global detection