Add some checks + minor renaming