Rename program and improve language