Renaming, setting java6 compliant...