Got rid of silly aliases.