Fixed names and lang file