More renaming and tests to incorporate Apache classes.