[minor] renames and types fixing