Remove ambiguous Block part of property names.