Added some regular expressions to improve rename function