update local/language handling and rename factory method