Touch up some independents (rename apsa.csl)