Renaming and minor fixes