removed unneeded #. usages
changed wcs-struct internal-name. but some confusions are still left..