Fixed some consistency issues
Added the renamed files