Strict types checking and new naming

Change-Id: Ibbe54da54c5dcb6d39fca0b6bcb606a04a167d15