Fixing up a few issues with the style of the aliases