Corrected names to avoid import problems python2/python3