Changed some names
added username-password