First pass at fixing aliases - turning them into sharing