Fixed some naming issues and made regenerating sources a bit easier.