Finish to remove namespace abbreviations #27