NAMESPACE corrected| changed function names were not propagated correctly, that is changed now