Constructors can now be renamed. Variable and image constructors tweaked for more uniform constructor appearance