Initial changes on naming language