some naming improvements, some workaround for a old le bug