Fix some inputvalidation and functionnames