Some renames

Prepare DLTK integration