Changed to new naming mechanism