[cvs-nhc98] patch applied (hat): Cleaned interfaces, mainly renamed some functions to have more